This is Info file diff.info, produced by Makeinfo-1.55 from the input file ./diff.texi. This file documents the the GNU `diff', `diff3', `sdiff', and `cmp' commands for showing the differences between text files and the `patch' command for using their output to update files. Copyright (C) 1992, 1993 Free Software Foundation, Inc. Permission is granted to make and distribute verbatim copies of this manual provided the copyright notice and this permission notice are preserved on all copies. Permission is granted to copy and distribute modified versions of this manual under the conditions for verbatim copying, provided that the entire resulting derived work is distributed under the terms of a permission notice identical to this one. Permission is granted to copy and distribute translations of this manual into another language, under the above conditions for modified versions, except that this permission notice may be stated in a translation approved by the Foundation. Indirect: diff.info-1: 1001 diff.info-2: 50219 diff.info-3: 98878 Tag Table: (Indirect) Node: Top Node: Overview Node: Comparison Node: Hunks Node: Whitespace Node: Blank Lines 10726 Node: Case Folding 11489 Node: Specified Folding 11902 Node: Brief 12992 Node: Binary 14243 Node: Output Formats 16754 Node: Sample diff Input 17446 Node: Normal 18939 Node: Detailed Normal 19868 Node: Example Normal 21593 Node: Context 22316 Node: Context Format 23864 Node: Detailed Context 24559 Node: Example Context 26115 Node: Less Context 27608 Node: Unified Format 28740 Node: Detailed Unified 29441 Node: Example Unified 30425 Node: Sections 31424 Node: Specified Headings 32168 Node: C Function Headings 33715 Node: Alternate Names 34459 Node: Side by Side 35356 Node: Side by Side Format 37495 Node: Example Side by Side 38392 Node: Scripts 39719 Node: ed Scripts 40117 Node: Detailed ed 41312 Node: Example ed 43053 Node: Forward ed 43491 Node: RCS 44253 Node: If-then-else 45463 Node: Line Group Formats 47120 Node: Line Formats 50219 Node: Detailed If-then-else 52206 Node: Example If-then-else 54107 Node: Comparing Directories 55159 Node: Adjusting Output 58274 Node: Tabs 58693 Node: Pagination 60213 Node: diff Performance 60632 Node: Comparing Three Files 62148 Node: Sample diff3 Input 63009 Node: Detailed diff3 Normal 63958 Node: diff3 Hunks 65566 Node: Example diff3 Normal 66852 Node: diff3 Merging 67876 Node: Which Changes 70086 Node: Marking Conflicts 71492 Node: Bypassing ed 73949 Node: Merging Incomplete Lines 75304 Node: Saving the Changed File 76021 Node: Interactive Merging 76631 Node: sdiff Option Summary 77329 Node: Merge Commands 78429 Node: Merging with patch 79565 Node: patch Input 81672 Node: Imperfect 82335 Node: Changed Whitespace 83070 Node: Reversed Patches 83813 Node: Inexact 85397 Node: Empty Files 88751 Node: Multiple Patches 89315 Node: patch Messages 90627 Node: Making Patches 92432 Node: Invoking cmp 95613 Node: cmp Options 96217 Node: Invoking diff 97412 Node: diff Options 98878 Node: Invoking diff3 108880 Node: diff3 Options 109511 Node: Invoking patch 112744 Node: patch Directories 114678 Node: Backups 116472 Node: Rejects 119019 Node: patch Options 119569 Node: Invoking sdiff 124329 Node: sdiff Options 125439 Node: Incomplete Lines 128786 Node: Projects 130409 Node: Shortcomings 131103 Node: Changing Structure 132098 Node: Special Files 133046 Node: Unusual File Names 133851 Node: Arbitrary Limits 134473 Node: Large Files 134902 Node: Ignoring Changes 135774 Node: Bugs 136318 Node: Concept Index 136963 End Tag Table